From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 7 Oct 2014 10:05:59 +0000 (+0200)
Subject: tests: do not leave running httpd after tests exit
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1091
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7b0e70b72fb1d7307a018a72dbf4a5c9bff9a235;p=ostree.git

tests: do not leave running httpd after tests exit

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---

diff --git a/tests/libtest.sh b/tests/libtest.sh
index e9d4450c..459040d3 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -157,7 +157,7 @@ setup_fake_remote_repo1() {
     mkdir ${test_tmpdir}/httpd
     cd httpd
     ln -s ${test_tmpdir}/ostree-srv ostree
-    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
     port=$(cat ${test_tmpdir}/httpd-port)
     echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
     cd ${oldpwd} 
@@ -261,7 +261,7 @@ EOF
     mkdir ${test_tmpdir}/httpd
     cd httpd
     ln -s ${test_tmpdir} ostree
-    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
     port=$(cat ${test_tmpdir}/httpd-port)
     echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
     cd ${oldpwd} 
diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index 516d6550..5e4baff6 100755
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -51,7 +51,7 @@ cd ${test_tmpdir}
 mkdir ${test_tmpdir}/httpd
 cd httpd
 ln -s ${test_tmpdir}/ostree-srv ostree
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port
 port=$(cat ${test_tmpdir}/httpd-port)
 echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
 cd ${oldpwd} 
diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh
index 3d685788..3cd425b3 100755
--- a/tests/test-pull-metalink.sh
+++ b/tests/test-pull-metalink.sh
@@ -27,7 +27,7 @@ setup_fake_remote_repo1 "archive-z2"
 cd ${test_tmpdir}
 mkdir metalink-data
 cd metalink-data
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/metalink-httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/metalink-httpd-port
 metalink_port=$(cat ${test_tmpdir}/metalink-httpd-port)
 echo "http://127.0.0.1:${metalink_port}" > ${test_tmpdir}/metalink-httpd-address